Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Mar 2012 08:13:52 +0000 (01:13 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Mar 2012 08:13:52 +0000 (01:13 -0700)
commitfe6322b8ea0ebb8e5f0c2dc3328fcd434a016417
treeee6bd854e15cebd403455c0c9194ad2dd29794a3
parent03da30e7488337ee91a90a74c5ee8601fb877f6c
parentd632e15c242d95e3a7cc2337cc8a5698fd9a959d
Merge from trunk.